OAK-3201 - Working on it

[Francesco Mari]

Hi,

I'm currently working on OAK-3201. Feel free to assign the issue to
me, since I don't have enough privileges to do it myself.

Thanks,

Francesco