Advance to version 5.4-beta-23