PSIMG-2954

PSIMG-2954