Feature/core-642