BASE-20 - Sync the 1.4 API Changes from Java to .Net

Synchronise the Java code changes to .Net