merge diff
pixi merge from dev 1.5.4