Merge branch '1668-prometheus-access-restrictions' into 'develop'