Fix for active setting in ApiController
Merge branch 'develop' into media