#7140 by Adrian

#7141 by Adrian

#7142 by EMB2