Merge "citrix" branch into "master".