Merge new changes into mako board files