Some refactoring: Move inlining functionality to its own model
Merge remote-tracking branch 'origin/master'