Release 3.3.0

Feature and bug fix release.

Change-Id: Ibb710bf312e1fbb114e182b92690118628b0571f