Merge latest master to alpha-3.0