[ET Trac] #2432: backport Baikal boundary handling fix to release branch