Fixes #14518, #14516 - status change ignores validations
(cherry picked from commit 5d5157202f0238eade7ce0b63195e2f397ca479c)
Fixes #14518, #14516 - status change ignores validations
(cherry picked from commit 5d5157202f0238eade7ce0b63195e2f397ca479c)