Moved to 4.0.rc2.1
Applied hotfix from develop