Merge tag '2.0.0-alpha5' into develop

Version 2.0.0-alpha5