[#3028] Move skip_validation params into context