[DF-4095] Fix by review comments