[RT18107] A number of modifications