SMOOKER-12243

SMOOKER-12243