@hb @bwrona Please verify there is no better way of achieving the same behaviour as in this Merge Request