Closes #3446383 Verified Patch #3 and created MR with one change. Please review and merge if looks good.