Bringing in modal from -28 branch