Merge "520612: Removed final keyword so that there is now  possibility to extend the predefined entity classes" into dev