Merge branch 'features/JAL-1667_1668-documentation' into Release_2_8_3_Branch