Merge "Converted function to inline"