1. sql script changes - add #IfRow3D
2. strict checking