preparation for new generic methods
Merge