Validate PR #1296 further and merge
Validate PR #1296 further and merge