Fix JIN-38 and a better package ordering (related to JIN-39)
Merge branch 'hotfix' into test