Fixes: #2731 Sync objects class with develop branch