[merge] Tatwi's mission changes