Issue:NIFS-12-3-55-59