Fixed up the issue MergeField

Fixed up merge field
Merge branch 'abdullah_4.12' into _MEE

Conflicts:
	apps/shared/mergefields.js