stable 2.0

l
Revert "stable 2.0"

This reverts commit 87acf05a5cbb9b69e2b625fb41906b77dddb2752.
Merge remote-tracking branch 'origin/master'