Merge branch 'development_varun' into 'testing'

Development varun

See merge request !35
2 jobs for testing in 7 seconds (queued for 5 seconds)