Support mixing generic and non generic inlines
Merge remote-tracking branch 'toshism/feature/mixed_inlines'