MERGE2_191007_270

Proposed user comment: