[merge] Tatwi's factory changes