Merge branch 'develop': actionlist templates