[DO NOT MERGE] Testing PR for issue 542

This PR contains various merged PRs as a test for the issue #542, because those PRs depend on one another.

Do not merge this, we will merge the individual PRs after properly reviewing them on their pages, and after everything is in, we will just close this issue.