Merge Version5 branch back into master

I think it is finally time to merge version5 back into master.
Any comments? I gonna merge it within the next 2 days otherwise.