Merge "Make class open for inherit" into tm-qpr-dev