Merge branch 'cr/33128/0560' into 'meeting/SA101'

TS 33.128 CR 0560 - Refactoring of LI Query and Acquisition Interfaces

See merge request !200