Merge commit '2fe121025cd8f24a3652728effe86188a9d4b5fa' * commit '2fe121025cd8f24a3652728effe86188a9d4b5fa': Move calc of EriIconIndex/Mode to whenever basis changes
Merge commit '2fe121025cd8f24a3652728effe86188a9d4b5fa' * commit '2fe121025cd8f24a3652728effe86188a9d4b5fa': Move calc of EriIconIndex/Mode to whenever basis changes