Merge "Skip null values in Utils.safeForeach" into pi-dev