Merge of 53002dfe03012e5f725016da1ac882f9a80e55b6

Seems it got lost somehow before ...
[Q9923] Help! - Change requirements to match the GO script

+ follow-ups