[Matahari] Comprises one previous patch plus new changes...