Development build into trunk

Release ready code