Merge "Add disableSelf() and more failure codes"