sync with #stable version 0.9 configuration