Merge "citrix" into "master".