applied bug-13 to master