Merge proposals dependent on lp://qastaging/~kissiel/checkbox/fix-1493713-category-selection

1. fix-1493713-category-selection
2. Dependent merge proposals