Merge branch 'features/ruby-elements' into 'develop'