Follow up MR to add changes to MR 5120

What does this MR do?

Created a follow-up MR to take care of missed doc review in !5120 (merged).

Why was this MR needed?

What's the best way to test this MR?

What are the relevant issue numbers?