Bugfix release 0.9.21.1

Change-Id: I8ecff73301f434fb73c6e0f46696d8a2668baadc
Merge "Bugfix release 0.9.21.1"