Merge tag '2.0.0-beta12' into develop

Version 2.0.0-beta12