ALF changes from master

Re-target PR https://github.com/adobe/brackets/pull/8602 to **release** branch.