Fix ESBJAVA-3171
Merge remote-tracking branch 'upstream/master'
undo commit
Fix CARBON-14879
Fixes related to ESBJAVA-3171 from MalakaS, merge branch 'malakasilva-master'