Merge from Yegeroff master + serialising the operation exception