Yes it's merged from master.

Please check the changes for rollbar. yes? No? Delete PR?