REST branch

Change-Id: If4f9d153ca2c3ac8dd728f116817dbfe497d7fd1