Merge "Add proper cfi directives." into lmp-dev