merge in alarm and scene api updates