merge sastes changes