Add support to set satellites timeout

Same fix than #7311, but submitted to master.