commiting changes from enterprise version for V2.4