Backport PR #4106: fix a couple of default block values

should be None

closes #4103

should be backported to 1.1