Merge Apsu's changes