Merging SFL and Upstream branches