Merge commit '1c9a92fd9fbe192f24e53c26cddeab401cefb108' * commit '1c9a92fd9fbe192f24e53c26cddeab401cefb108': Rework some code so that it works the way it was supposed to work.
Merge commit '1c9a92fd9fbe192f24e53c26cddeab401cefb108' * commit '1c9a92fd9fbe192f24e53c26cddeab401cefb108': Rework some code so that it works the way it was supposed to work.