Fortunately 5.4 and 6.0 are quite close so often bugs in 5.4 are in 6.0 too