management can be handled properly. BUG: 248340 FIXED-IN: 4.6.4 REVIEW: 101469 (cherry picked from commit 24e79c00)