Merge branch 'hotfix/3997'

Close #3997
Fix ViewFeedStrategyFactory comment
Merge branch 'hotfix/4001' into develop

Forward port #4001