#25035 progress implemented