Feature/core 642