Prepare for next development iteration

Change-Id: I14e70e5dd6403b67a41ec74189122bd1d5eb7a30