Fix Qt3D
Merge branch 'dev' into 5.4