CONN-259: Changed behavior to not require saving org first.