Merge branch 'JAL-2075_features_hiddeng' into develop