Merge commit 'eba66c3' into master_merge