Final merging of staging into master