CYB-367 - Self review on code review follow-up