[Core] Fixed last merge issues :-/