combination of 3 commits by task650 ty bud

Change-Id: Ib8d6bb39d6ace8b9382528f0d42647bc178b7c5b