BUGS:407952

Ok, there is no make_unique in C++11 so I just used the standard unique_ptr.

Please test this. I think this is just a workaround. We need a way to synchronize access to these variables in multi-threaded fashion
perhaps using std::unique_lock<> or something similar.