Merged from branch stable-succint-refactor