Implemented fix for Revert to Saved FR CODE-2132