Better deploy script.
Merge branch 'release/v16'