changes for hot fix 1.15.2