Merge "Change already inline error to warning"