[PATCH] Update remainder of staging and dev and publictest