Develop branch sync

Add some things that were ommitted when merging

Change-Id: I47f78d01a6d938e8748a9622d77bbe008c0c5fd8