Resolve #3186185 "Current versions do"

Merged m4olivei requested to merge issue/amp-3186185:3186185-current-versions-do into 8.x-3.x

Closes #3186185

Merge request reports