Bug 16424: Handle framework code properly also when adding a new record