Last minute fix for initial boundary event state
Merge remote-tracking branch 'designer-original/master'