Prepare for next development iteration

Change-Id: I4ed041b7374e932abebe4e01bab46fcb5920b68d