Add support for deviations on next line and multiple lines

Add support for deviations on next line and multiple lines #2792