DEVIDM-151: Reverted to using default timeout values