Backport checkbox value fix to Dev branch.