DC/Melanie/Pooja | #3740 | Merging enkoto core with original