Add support to set satellites timeout
Merge pull request #7316 from ayr-ton/master

Add support to set satellites timeout