Merge "Add missing __init__.py file"