Merge "DO NOT MERGE Make classes open for inherit" into tm-qpr-dev