Build #166 (Oct 12, 2019 4:55:04 PM)

1. Resolve merge conflicts (detail)

Started by GitLab push by Yann Garcia

• refs/remotes/origin/STF525