SEC-2347: Polish