reintegrated model changes from branch 3.3-MC-SNAPSHOT