Merge orgcom changes to main trunk