MERGE2_191007_211

Proposed user comment: