Merge tag '2.0.0-alpha8' into develop

Version 2.0.0-alpha8