Merge "changed number of iatoms for F_SETTLE from 1 to 3" into release-4-6