
            Merge Simple View changes into Develop

fb078cd