#1069, #1092, #1098, #1137 could be closed now

Issues to close are given in the commit message!