Schema synchronization improvements

changes for RUBY-61, RUBY-62 and RUBY-63