Forcing stable flags for release
Merge branch '3.0.5' into 3.0