Implemented changes from P1716#310

tomaszkam wants to merge 2 commits intoCaseyCarter:masterCaseyCarter/cmcstl2:masterfrom

tomaszkam:indirect_relation_removaltomaszkam/cmcstl2:indirect_relation_removalCopy head branch name to clipboard