Initial 1.7.2 Port & Commit