Initial code sync updated to Release 2.5.18