Feature 3692 2.4

Feature 3692 for 2.4 branch