Re-merge with master (component_management.clj updated)