Backport of node collection perfomance improvement to fuel 3.1 version

unit, integration and ui tests passed