Merge "Fix recent changes and watchlist separator whitespace"