Fixes #2385 (closed)
changed milestone to %3.5.x
added UI label
requested review from @Skantes
approved this merge request
merged