MAGEINT-302: added rewrite for considering configured timeout