merged down #563/#564 to master