sync with milwaukeejs branch