Merge "Add '-unstable' to solve ODR violation"