Merge 'origin/master' into v5.0

Change-Id: Ic95c9efe0f67db8b3659c71ad88c42c33ae93015