StarWars feed setup
Merge remote-tracking branch 'origin/PLA-1762' into PLA-1762