Merge branch 'develop' into 'Support/2.6.X'

develop into Support/2.6.X

See merge request !427
2 jobs for fix/13343_Read_Resource_from_API