Merge branch '10115TypeAheadStaticList' into '10115ThypeAheadStaticList2'

merge changes into fixes

See merge request !254
3 jobs for 10115ThypeAheadStaticList2 in 3 minutes and 28 seconds (queued for 1 minute and 13 seconds)