Fix organic support issues by syncing with Prusa's changes. Thanks to Prusa. Jira: none Change-Id: I96fa1a939767bb0b0d2e8a5fd72966bb10a2042e (cherry picked from commit 89607dc73313e1b5d389674ed2d8f4f358bcb8b9)
Change-Id: Ibeab33f27ad7a2531bb256edd0e3f853cf8def7c (cherry picked from commit 6cfb4371a1b9053b54569d91a9c29af97a753c0e)
Change-Id: I2bf43bf36b588c6edb8bf0cbeec8e62356b527b9