Prepare for next development iteration

Change-Id: Idc2045acc6c646395a5b66a2f0973451569d2114