Merge tag '1.3.8' into develop

Release: 1.3.8
Preparation for new development cycle after release 1.3.8
Use same "name" for classes in container
Version bump 1.3.9-rc.1
Version bump 1.3.9
Merge branch 'release/1.3.9'