Changeset 9598

#1966: Fixed a bug which caused the stacking-contraint to be wrongly enforced; Did some cleanup;