Merge "show features" (bug #3515)