CLSN-995 code review settlement :Issue Fix.  All forms are merge