Support auto engine registration
Merge branch 'feature/add-engine_auto_registration' into sprint6