This is current master release and needs to be integrated to the develop/Master branch