Merge "Improvements of D2D API according to the review" into sc-dev