merge with last v096 changes