[kronosnet/kronosnet] a26a44: Merge pull request #304 from kronosnet/am_conditional