Merge pull request #2514 from prototech/ticket/12553