Merge branch 'vr/help-per-platform'