BZ-13036 fixed address check
Merge branch 'EBP_Flow_Improvements' into integration