Merge branch 'feature/5226_Loader4LoadSQW' into develop