Merge "Revert angle classifier relaxation" into pi-dev