#5242, #5223 Improve performance of derivate loading and editing