1.0.x

This macro-PR is only in place here to track changes in the 1.0.x branch and handle discussion about it.