backport #737
backport #737

Closes #739

ahmedbodi/test2,cerebrus29301/crowncoin,xuyangcn/opalcoin,xuyangcn/opalcoin,ArgonToken/ArgonToken,ArgonToken/ArgonToken,xuyangcn/opalcoin,cerebrus29301/crowncoin,grumpydevelop/singularity,grumpydevelop/singularity,ahmedbodi/test2,ahmedbodi/test2,ArgonToken/ArgonToken,cerebrus29301/crowncoin,ahmedbodi/test2,ahmedbodi/test2,xuyangcn/opalcoin,grumpydevelop/singularity,ahmedbodi/test2,cerebrus29301/crowncoin,grumpydevelop/singularity,cerebrus29301/crowncoin,grumpydevelop/singularity,ArgonToken/ArgonToken,xuyangcn/opalcoin,ArgonToken/ArgonToken,ArgonToken/ArgonToken,grumpydevelop/singularity,xuyangcn/opalcoin,cerebrus29301/crowncoin