Merged with dev-branch