Changed order of apply and markAsTabu to allow AdaptiveTenure
Merge branch 'develop' of git@github.com:gortazar/optsicom-framework.git into develop