manual Merge Bluefox/Master