changes to several categories
Merge commit '5aeb17e5637f8f2ee01d3c1ac97b8df357109dd2' into HEAD