Merged wip into stable branches (Settings and base)