Merge "Refactor: improve null safety by using empty list instead of null"