Updated with 2.7.0 changes by Shinni
Updated with 2.7.1 changes by Shinni