board_htc merge in from pyramid sources