Removed 2.6 version due to failing test
Solved bug causing that arguments were not considered on cache
Model updated
Merge branch 'develop'