Merge branch 'GL'

simple test parent View