Merge branch 'devel_varun' into 'testing'

Devel varun

See merge request !79
1 job for testing in 5 seconds (queued for 3 seconds)