testing standard controller method in progress
completed conversion to generated controller methods
Merge branch 'develop' into testing