(#2590) - update for 3.0.0