Erik Jan de Wit I've fixed the issue described as PR1.png and PR2.png in MP-569, I will send you PR into your PR