Merge branch 'master' into flags-refactor

There were just simple conflicts in NEWS and docs.
11 jobs for flags-refactor
in 4 minutes and 39 seconds and was queued for 3 seconds