Import of released version 1.3.3.
Import of released version 1.3.4.
Import of released version 1.3.5.
Import of released version 1.3.6.
Import of released version 1.3.7.
Import of released version 1.3.8.
Import of released version 1.3.9.
Merge upstream changes