MERGE2_191007_202

Proposed user comment: