Merge "Experimental change to two pass prediction decay calculation." into experimental