Merged in changes from adative branch
mergin