Merge pull request #1 from FacetsTechnologies/dev/v02.5.0

Merging latest dev to master
Merge pull request #2 from FacetsTechnologies/master

Merge pull request #1 from FacetsTechnologies/dev/v02.5.0