Prod release 3.0.7