ECMS-6036 ECMS-5692 Problems of content activity after deleting nodes
Merge commit '287a63d802937167a830d43b8c19ea159c53e7c8' into HEAD