Same as @ dev-branch. Merge resulted in errors