Custom field validations
Revert "Custom field validations"

This reverts commit 48b14e060c019b05915e5ba6a9c5927640f91595.
Merge branch 'develop' into custom_field_index