This commit applies the harmonization changes in eacfd77 whilst keeping the doc attributes specific changes to 6.0.x
eacfd77