IMP-30 #resolve change processing order
Mark v0.4.6