Merge branch 'dev'

Authored by cgilles on Jun 6 2020, 12:11 PM.