merge from master to QA

:dart: