Missed these changes in last patch commit, had to manually merge due to changes in Extensions SVN 1010-1012.