BZ-12914 fixed styles
Merge branch 'EBP_Flow_Improvements' into integration