update 5.4-beta4 from https://github.com/andip71 boeffla43