Made parameters set in the _construct function enumerable or not
Merge branch 'develop' into feature/resource