[Matahari] Squashed commits...