ZON-576895 xlogin image
Merge remote branch 'origin/master'