Merge "519139: Removed final keyword" into dev_0.7