some more details on online help
Merge branch 'v5-stable' into v7-stable
fix merge problem