Merge addon-container feature branch