Afdp 92

We would like to have a code review session for these changes.