Merge stage to master

Merge ```stage``` to ```master```