Breaking changes (7/16)

Breaking changes