1st commit on poma-6164
Additional fix for POMA-6671