Updated implementation for delay() and issue #133 in core-common-lib