[main] folds in retro and bug fixes made in dev-sci (#551, #558, #561…

[main] folds in retro and bug fixes made in dev-sci (#551, #558, #561… #168