Merge branch 'develop' into more_efficient_PAE