LPS-42950 Pass a single object instead of an array where possible