Merge remote-tracking branch 'origin/master'
Lazor detection
merge