wip prod with mini

Change-Id: I381d8ddf3a2bbe37e3c4b1c4bf423f16beffaaf4