Merge master 3.04.4