adding lam
Merge branch 'develop' into qa/1