Optimization of system path queries
Merge branch 'feature/43472489-cookies-not-accessible' into develop