Merge "Move API to be used in MODULE_LIBRARY" into main