(pr fixes, merge pending)