Getting ready for next development cycle

Change-Id: If5072296ec67c5705d9497cabf3a2fe6321955d4