Merge all changes back from testing