Account master type patch and Stock RBNB Diff