am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8
automerge: 0738bae

* commit '0738bae9164b150ce81b8cba57be9105a0308115':