Merge "Add container property." into main