[NUCCORE-1253] Move id conversion handling