Merge "yaml file for bundle-based-reconciliaion script"