Map functional 9.5.2 + fix for previous 9.5.1