Merged quickfixes into runnertree-rework