Backport #207 and #210 to 15.x#213

pavelhoral merged 2 commits intoWrenSecurity:sustaining/15.xWrenSecurity/wrenam:sustaining/15.xfrom

karelmaxa:backport-15.xkarelmaxa/wrenam:backport-15.xCopy head branch name to clipboard