Merge "Enable custom math verification." into lmp-dev