Fixed empty block and extra string issues

Merged Zhou Fang requested to merge zhoufang/solstice-assets:zhoufang/master/fix346 into master

Merge request reports