Prepare for next development iteration

Change-Id: I54e51c69c25ee8affb4dfa03324b03fb6310b0c9