Merge "Allow renaming inactive subscriptions." into qt-dev