Wip/0.13.5 merge

Review by @eed3si9n 

Just merged changes in 0.13.5 branch to 0.13