Merge "[pm] Add null check and return first" into main