Usually Manoj merges such posts as yours to the feedback to this one:
You could also do it now for 2.2 by yourself:
But best would be to report an issue on gitlab. Instructions you can find in my 2 links.