Merge sfl branch from lp