Merge branch 'simplify_PRT' into release