merge from octofalcon on sep3