Alpha 35: merge + board updates