Merging all development ongoing on master into index128 branch, resolving
appropriate conflicts and doing proper changes.