Merge branch 'fix/onset_nullptr' (thanks to @niugx)