related to sylva-projects/sylva-core#2691 (closed) sylva-projects/sylva-core#2724 (closed)
s-core MR : sylva-projects/sylva-core!5347 (merged)