ROCKOPEN-3698

ROCKOPEN-3698