- Apply fixes from `master`