manual merge of: alda519-wip_branch