Merge changes from team/russell/g722-sillyness ...