interactive: Updates from CAF

Change-Id: I8f704dd1e8b16a577fa2d7064abcc5a61b290678