Backport changes from board sources