merge fixes and A.Borovikov feature_interface.i change merge