ANA-513: review fixes
ANA-513: review fixes