Updated dev branch to revision 42241