Dependency updates.
Adapt some behaviours to match new plan rules.
Bug fixes and security improvements.
