droped customization, merged with master