updates from @mikeNG

Change-Id: I07e68e32216f4b57c40ad4115622537868802fd4