add_thingy patch backport from mojo