Merge "Add a global setting for forcing PSS collection" into main