Merge pull request #4673 from kumpera/fix_stdelem_ref_perf