Missing default values

Review 1631 by @larkost
Merge branch 'v1.13.x' into sam_2537
Merge branch 'sam_2537' into sam_2563