Customer-Enquiry link

Customer-Enquiry link
Merge remote-tracking branch 'origin/master'
minor code changes and fixes

minor code changes and fixes
fixing potential bug

fixing potential bug