All changes incl. 6.3.4