Issue #3414917: Revert back to use DS 3.16.0 as many regressions issues in the back-end and front-end followed with 3.17.0