Cherry-picked from !72 (merged)
Merge details
merged
mentioned in commit b1309b90
added modernisation label