I am not working on the D7 release, please open a new issue for any changes/r...