All changes submitted by Padma

These have been discussed at length by theme leads.