Refactoring
Merge commit '0f89cfa7fb7f2417144c59b9fef8cc2eeeebc629'