A draft. Depends on the decision that would be taken on mutter!4505 (merged).
Not worth reviewing yet.