bringing dev stream bugfix to stable because its important
1 file changed