Updated dev branch to revision 41684