CLI 2.4.1-related changes