some chnages
Merge civicrm-bug-fix