Feature 19962

Please review the changes for ticket 19962