Prepare next development iteration

Change-Id: I4f13e3a32b16ac1df526a901acf42e79b20f5d58