Merge front-end into master