[CHE] deploy of issue/16958