unblocking index actions
Merge branch 'master' into scottsims