Apply diff of pr #1133 to develop branch