[DF-4660] fixes for review