work in progress changes for 3.5.4