Merge branch '70X_v2' into cat72x