update 2.4-beta5 from https://github.com/andip71 boeffla11.0