merged from Marucoin