merging cmr/rust/gate-macro-args = 41da99df into auto