412.10 merge dev branch (425.01) - Fixed xxvm double display