This update fixes various bugs and adds support for an upcoming feature.
