Merged all changes from branch raw1