sync with main branch (api manager)