(#2158) - bring back custom extend