Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp