RW 6.3.3 Upgrade

@Mani
Look here, the problem is known. There are several threads about this in the forum.