Merge "D2D communication improvements." into sc-dev