Merge branch 'release/0.6.1' into develop
Do not include once blocked site into PAC.
Merge branch 'develop'