Adding pr  #24 from GayashanNA/CARBON-14867

Please don't merge this till relevant changes are push carbon utils WSO2 repo

This reverts commit 2622b963ec1187a9a133b6eae39340f9a6a843f3.