MERGE TEST-BRANCH#1 AFTER SOME MODIFICATIONS