Manually merged eSyndiCat, Subrion changes