Tagging version 7.x-0.23
Merge branch 'release/7.x-0.23' into develop