related #1635 #18159 This will probably be obsolete at some point, but it should not break anything and it may help some users