sync with private 3.0.74 repo