Merge remote-tracking branch 'emmapeel/inlines_correction'