Some of the requested updates, rebase on master

Change-Id: I0260a4dd315542da4f53593f53aedf34df84f491