Visual Qa
Pulled feature/29
Merge branch 'feature/29' into develop