Fixes #3104 (closed)
changed milestone to %3.6.x
added UX feature labels
requested review from @Skantes
merged