Merge from Sarakha fork