CORE-5832: moved the multiplicity conversion from the last commit in order to make the conversion cleaner