allow null parameter to prevent NPE
Merge remote-tracking branch 'origin/8.36'