[DF-3553] fixes for review