Merge branch 'fsecure-update'