Update #1 for dev-branch