No new functionality etc, Simply merging due to rebase. Change-Id: I5b2417548cbce35acf9121baf6470f1c38d5a1fb