Ajay | #3068 | Data type change to/from unique id field