Sergey, I guess we definitely need another series for this. Furthermore, IIRC we decided to leave shadowing, so the current changes are simply not relevant. Please adjust the patches related to tests considering our recent discussion in cover letter and send a new patchset. -- Best regards, IM