Merge remote-tracking branch 'marti/CB-6832'