2.6 OES 2 SP1

In addition to bug fixes, the following feature for DFS is added since the OES 2 release.