Adding guard around activityExecutable in .ftl
Update merge from local master.