Gsoc layers merged with master