We want this on all deliverables. (cherry picked from commit 58210badb5a83d11f9fe088f20c913981d3013f9)