Merge commit '09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3' * commit '09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3': Fix pairings lost on reboot.