* should be ready for merge back - RC1