503 fwretract dev branch

Hopefully this is all sorted now, updated pull against the Development branch for #1236