BZ-12744 more validation
Merge branch 'EBP_Flow_Improvements' of https://github.com/NoesisEnergy/bootstrap into EBP_Flow_Improvements