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

* commit '9e432a698b6422118c2cc0d0a6c12194c9d1fc32':