aligned with master (removed deprecated features)