Merge pull request #1 from olokos/lineage-17.1