Bring in line with Slim (2/2)

Change-Id: Ibba21e4b4a913433da9c68341abb09622ea30b3b