manually merged #474 (heartharena import)