Merge master to branch 569