merging cmr/rust/gate-macro-args = 358a753f into auto