Merge "updating the architecture.rst file for SO"