Develop candidate2

This branch contains all branches for the rewiev and future merge with develop