Validation bugs
(cherry picked from commit 75b5d1912b76b971627d108023891202310873a6)
Release 1.2f (internal: 16)