Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the

changes from start of branch upto r22b2 were already merged, of course).