Getting ready for merge

Change-Id: Ie1c0def3869fbe0d955b010a02a3a82a8563cd24