Reconcile with Muppets as they look very up-to-date

Change-Id: Ic5814d247d67515c1f99ca419b520b8b5bd128ca