Sync to development version
Synch to development version, pt 2