[16.0] cms_form* port as-is from 13.0 (not installable)

[16.0] cms_form* port as-is from 13.0 (not installable) #54