Merge branches 'fixes', 'cleanups' and 'boards'