* [ISSUE #4037] Merge with origin * [ISSUE #4048] Add assertions for DeleteExpiredCommitLogSubCommandTest