Merge "Added message_abort and operand enums" into klp-modular-dev