Breaking changes (12/16)

Breaking changes