Null tests in alignment loading code
Merge remote-tracking branch: upstream/master