Merge commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5' * commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5': null check