Prepare for next development iteration

Change-Id: I67b648195c5be79e33f48238ac4bda36e62cd143