Please review branch feature/ZEN-12397

This could become deferred in the future? Because even in such case it seems to me that this goes against YAGNI principle.