Few changes from vision

Change-Id: Iffce0ca52690306a8749bfa5d6e49e807ee89e98