Updates with features at version 7.x-1.4