SM-12919  Added review comments