Merge "Allow default state, reset state, and nesting for binary states"