Minor model and toolbox updates backported from 10.3

Minor model and toolbox updates backported from 10.3