Updates from A36444 development