Few changes fort release 3.1

Few changes fort release 3.1