LPS-51328

Issue only affects master. No backport needed.

cc @brandizzi

Thanks