Merge branch 'order_policycache_misc' into 'master'

config order, policy cache, misc

see commit messages

See merge request !1
.gitlab-ci.yml not found in this commit