Merge the fixes from my commandhandler branch