Updated with committed ticket 25182