Merge "Remove INLINE/FORCEINLINE"