finalize custom field management
Merge branch 'master' of github.com:neeraji2it/H5SW