#22941129859745 Added ability to specify event location