Prepare for next development iteration

Change-Id: I18a87d7e41c9149e0f071db1edb083089ca475d8