Merged changes to NIAM6.0.