fixup! Unify Halcyon commands
fixup! Unify Halcyon commands