Next/Next Line fixed
Merge remote-tracking branch 'origin/dev'