[FEATURE enhanced-actions-flag] Enhanced actions

This satisfied #3808