Action set

Based on "merge" PR