5.3 (fixed) + first step of 5.4