Adjusted to improved return values of model ids.
Authored by: aktion-hip 2012-03-19
Parent: [r1200]
Child: [r1202]