Merge branch 'devel_varun' into 'testing'

Devel varun

See merge request !96
1 job for testing in 9 seconds (queued for 2 seconds)