Merge "Inline and remove redundant method" into main