Since the first part of the bug is fixed and the second part is in the separate bug #22944, I will close this one
Since the first part of the bug is fixed and the second part is in the separate bug #22944, I will close this one