Fixed release mode complaint that values might be uninitialized.
Merge branch 'next' into grey_issue_1169