Merge remote-tracking branch 'origin/next-simrel'

Change-Id: I76ab53a4748fd175172fbad28f00ec12792427f0
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>