MAJ-1094: fixed wrong parent
Merge remote-tracking branch 'origin/master'