merge dev branch

2 jobs for merge_issue_21 in 3 minutes and 10 seconds (queued for 2 seconds)