Change Details

Unit tests, plus: {F1193800} {F1193801}