Merge pull request #2035 from nabinhait/hotfix

Account master type patch and Stock RBNB Diff