Merge branch 'feature/8_jsviews' into integration