Hi Emil, Please cherry-pick these two regression fixes to 17.3: 6ac2d16901927013393f873a34c717ece5014c1a cfcfa0b9cd1b1d563a988b1250950057c4612ac9 Thanks, Matt