Merge "use modern construct 'override' in the derive class." into devel/master