(Bluefox) merge request from hq