Merge "remove precondition-lshal for consistency" into pi-dev