line triggering
Merge branch 'master' into linetriggering
line triggering functional