[bamboo] Automated branch merge (from 1.12:0a6ceb5339bae23d90c5e445de0db523c57f6ca8)
[bamboo] Automated branch merge (from space/13.2:c6b18e6ead5a32a5a06bf5a8b2014a03184ef0da)