* backport of commit ed4a98f300 * add merge function --------- Co-authored-by: Eric <eric@haberkorn.co>
ed4a98f300