This change should be tagged to this release as well