D7 Update

This update affects all D7 scripts.

D7 Update