DF-5129 fix victor review comment and speedup Incredibuild for UnitTests