Merge "Fix NPE from feedback (issue 12106858)" into jb-ub-now-kermit