#4659 - parent is no snapshot verson
Merge remote-tracking branch 'origin/master'