Additional fix for POMA-6671 and Resolved un merged issues