Define aliases: Fact and Action
Merge branch 'develop'