Merge "Remove redundant library call" into main