Merged: The proposed spirit changes look problematic in the wrong way

Comments