Merge "Replace inline with INLINE" into nextgenv2