3d line S
Revert "3d line S"

This reverts commit a85b6c3b56cf38edc14f705b1f46b0053341c028.
Merge remote-tracking branch 'origin/master'