D3531

WIP: Bug XX3: Test code review before/after feature