Merged with latest orig branch and removed some tmp files