Merge branch 'devel_varun' into 'testing'

Devel varun

See merge request !78
1 job for testing in 6 seconds (queued for 2 seconds)