Merge "Workaround for Hercules erratum 1688305" into integration