NewBreeze v2.3.0 bugfix
Incorporating upstream changes