Merge "Increase timeout values for callback" into sc-dev