Merge changes from develop in 248_enhanceInnerClass