Pulled latest changes by Scanno