fixing fcv on set problem
Merging origin/dval/master-pending-fcv-set-fix into master