minor big fixed
Merge branch 'develop' into testing
init editCustomFields test