Merge dev-18-detail-controller-tests