integrate changes from merges in master into objetization (PARTIAL)