Fix for PR ipa/63851 and ipa/63852.