This PR is a merge of the current changes on development. We are going to delete this branch since it does not make sense to have 2 branches for development work.
Coverage increased (+0.02%) to 84.534% when pulling 6b1fc92c09cc5a3f3684a482b7941f5951591a26 on development into 70f57fb551f6ec0944bdfb16d5065e6b9bc6ffa1 on master.
This PR is a merge of the current changes on development. We are going to delete this branch since it does not make sense to have 2 branches for development work.