Dev-freeze bugfix.

- Fixed #3337.
- Fixes from master.