layout compressor bug
merge from master