Fixed/float-point code merge on laser.*