If we merge #527 , the duplication will be removed from #528 .