Apply bulk change to 1.3.3

relates to #7729