Origin/F19 fixes [merge]