OS-7257 Add Fields in AFW Data soure
OS-7274 Replace PCM MAndatory and Account Group Data source with Extract versions