MIFOSX-1335,MIFOSX-1300 - corrected FD and RD related issues