Fixed issue #2263
Merge remote-tracking branch 'origin/develop' into develop
Refactoring of ORecordSerializerJSON
Merge remote-tracking branch 'origin/develop' into develop
Prevent eating of exception by ConcurrentQueriesTest
Merge remote-tracking branch 'origin/develop' into develop