Merge with upstream + deltaspike examples added