Merge changes from citrix branch into master.