MTM-83 fixed re-opened bug regarding user settable timeout