#2173, 2174, 2197, 2175, 2176 - Updated topics with peer review comments