Front-ported CORE-4437 and CORE-4438.

git-svn-id: svn+ssh://svn.code.sf.net/p/firebird/code/firebird/trunk@60404 65644016-39b1-43b1-bf79-96bc8fe82c15