manual merge of shinigamichan build