SEC-2238: Polish