SpearElements
Merge branch 'spear-element' into develop