Merge branch 'hotfix/0.4.7'
estimates/short::short_name returned blank list in certain situations
Merge branch 'hotfix/0.4.8' into dev