Diff salt-3006.3 with a salt-3007.1-r2

Thank you!