Pulling in changes from Applifier fork