Update from bear:master