Merge tag '2.0.0-alpha7' into develop

Version 2.0.0-alpha7