mod_skinny work on FS-5632 - first pass
mod_skinny work on FS-5632 - few more cases