Cherrypicked dashboard stretch fix into v1.44