Bunch of changes related to saving FD set.
Changes to fd set save request
Merged with dev