More model alignment changes
Merge remote-tracking branch 'remotes/origin/develop'