Merge from IdeaBlade/Breeze