3.0

3.19.13+merge4