Ticket 16311

Pull request against master branch.