Revert "Cherry pick commit"

This reverts commit 3aaaadeb73ff4a381dd743e5f5529e87f50a69bb.
Revert "Revert "Cherry pick commit""

This reverts commit 1df631f2b1f7f6d7c3bddb7ad3395013ae98e298.
Cherry pic latest
changed slave completely