Fix compiler warnings. Re #7623
Merge branch 'feature/7623_vector_attributes' into develop