Integrated manual merge and latest changes from empire phoenix upstream rev:26