Update Maharshi branch