Added 2.7.0 updates by Shinni