K 10 svn:author V 6 marcus K 8 svn:date V 27 2016-10-16T14:54:09.309597Z K 7 svn:log V 60 Commit forgotten patch from the 2.2.0 upgrade. PR: 213516 END