(#2251) - fix race condition in ldb changes
(#2158) - bring back custom extend