ISPN-4796 Compilation errors in Eclipse
singletonstoretest separate branch