Merge pull request #13333 from lockiechen/fix/13329-boolean-variable-default