[Matahari] Reconsidering v0.4 branch