Merge branch 'feature/JAL-3121gffAttributeMap' into develop