Merge branch 'origin/xss'
Allow proc for static_navigation url parameter