Merge cayuga release into master branch

Change-Id: I54ab3c22d281efe69af9c9108fcbfadd3cc747ee