SFV-1391
Code review fixes