Add quick fix
Merge branch 'master' into SPSModule_2
Update SPS Module tests, add validation in range of availability of content types on show