#2192421: Fix Feeds integration