merge code from dev/experimental

Change-Id: Ic36d93b23a3dcad8a06bda4f685323bbf729a58d