Changed by revision rev#67589 (and rev#67588)