PLA-984 fixed namespaces filtering + code elegance
PLA-984 code elegance
PLA-984 code elegance
Merge branch 'PLA-984' into PLA-986
PLA-986 merged from 984 + cache fix