Merge release back into master to trigger ALF localization update