Final comit for 1.3