Merge remote branch 'origin/bug_380_stop_service_entering_tuner_setup'