fixed EBC overwriting while "imposing" EBCs
Merge remote-tracking branch 'origin/master'