~ fixed BM-384 Sometimes Artifact Tree is "confused"
Merge remote-tracking branch 'refs/remotes/origin/master'