Merge 'Use ADC mode when both IN and ADC modes are set'

See merge request !355
3 jobs for master in 49 seconds (queued for 5 seconds)