Merge branch 'apex' into 4.14.98