Merging up to 1.3-2.2 with numerous updates