Merge branch 'master' into util_open
Merge remote-tracking branch 'origin/util_open' into util_open