r8404: small upstream merges of appweb code