New pipeline adjustments 2020 03 19

Updated according to new requirements. To merge with development branch. Please review.