3.3/develop

Bug Report #4604