Merge pull request #926 from clevertension/bugbounty-2

fix issue #905, #910
fix issue #896