2.1: Merged revisions 995411, 995412, 999298, 999299, 999965, 1000947, 1036336 and 1036337 (JCR-2089 and JCR-2753)