Afdp 130

Completion of story AFDP-130