LRDCOM-11153 Fix for 6120