Merge "disableSelf doesn't recover the init state of value"