(1)from fox -dev_bugfix to remote/bugfix

merging (1)from fox -dev_bugfix to remote/bugfix