Merge changes from release branch back to master

Mainly want to get ALF changes, but merging all changes so far.