Merge proposals

Sm-bugs-tp has no merge proposals.