Merge "Move note about changing approval categories to the correct section"