Updated dev branch to revision 40806