(#2725) - 3.0.4 version updates