Merge pull request #2536 from nabinhait/fix1

Fixes in Stock Analytics