Combined fixes rebase.

Kobe Nysrequested to merge
combined_fixes into master

Merge request reports