Misc changes - V5

Change-Id: I15848e80b1eae487336542fe23c443cd906ba821