Merge with master and upgrade to 7.2.0
Adds missing file