Merge branch 'LOGCXX-500' into LOGCXX-500-2