Master and Development have diverged #1465
Description
Due to some wrong merges, master and development branches have diverged by about 300 commits. This needs to be fixed so that merges to and fro are not affected in future. If development is in latest stage and ready, it should be forced pushed to master, or some other solution should be applied