Merge branch issue_12