made some changes related to setting Amount values
Merge branch 'branch_11A6'
made changes to code for null/blank checks