Merge "Handle nested signals" into lmp-dev