Merge branch 'steven' into development
Further Fixes for input
Merge branch 'development' into steven
Clipping fix