Given this region is going to change a bit after feature/complex_value and feature/geoqueries merging into develop, I have opted to defer the fix after such merge operations. Until that moment, the FIXME P10 helps as reminder.

NTC (just informative)