merge in 'retry-on-glance-exception' from master