Merge "Fix pivot update rejection logic"