Merged dev changes for going into gamma version.