Feature #21489 completed