Merge "DO NOT MERGE Fix divide by zero" into klp-dev