Form map limitation squash

I squashed commits of branch named "form-map-limitation" as a single one named "form-map-limitation".
I take in gmethvin's suggestion.

>cchantep
Please see whether my operation and content is okay. Thank you.