Merge tag '2.0.0-alpha6' into develop

Version 2.0.0-alpha6