Merge "[569076] add empty value for subapps" into 1.13.x