Fixing messed up merge from dev-MK