Merge branch 'new-theme-for-yarraplenty-whitehorse'
bug fixing for SIP without CQ code
Merge branch 'new-theme-for-yarraplenty-whitehorse'