Modified Div, Dist, Upz condition in all models
Merge origin/master