Merge #15980

Fixes for #15980, just lint, thanks for the addition @lomeroe!