Merge branch 'release/7.x-0.3'
update features