Merge "Cosmetic changes on Field Classification TODOs and docs." into pi-dev