PLA-1487 refactoring of code
Merge remote-tracking branch 'origin/PLA-1487-feed-refactoring' into PLA-1487-feed-refactoring
PLA-1487 refactoring of code
PLA-1487 refactoring of code
PLA-1487 refactoring of code