merged selected patches from refactor stelzzz