1) why disable?
2) please look in this method, in 3 places (where there are comments): I added during/because of merge. Is it correct?