changes based on commits in cloud-core

cloud-core commit: 710c822022a59bdc16f9e431cb54bf43b857c101
ref #30