merge from sall-vixen