Merge branch 'feature/JAL-654_dssp' into Release_2_8_2_Branch