Merge remote-tracking branch 'remotes/upstream/master' into helios
helios: .st prologue fixed