v7 change for master