CLSN -2107 : moved shared logic to common file
CLSN -2107 : moved shared logic to common file