Merge branch 'master' into raman/master_feeds