Merging in UGerhards-v5-stable-issue11
Merged v5-stable into v7-stable.