Possible solution to gfixup spoh=0 problem
Merge remote-tracking branch 'mandli/rm-layer-density' into rm-layer-density