Merge branch 'fix/2291-atom-feed-escape' into 'develop'