Merge with stool branch from FPP