Code review mark-ups
Take lastest sas-client