Feed and setting changes integrated
Integrated with latest code