UC-1723 - bug fixes; precommit fixes