variable fix
Merge branch 'development' into livetest