Updated attribtuion for O/S elements
Merge commit 'f8a214d' into develop