Current master can be merged to 1.0.0-dev