Wip/merge 0.13.7

Review by @eed3si9n