Updated dev branch to revision 39799