Merge branch 'develop' into create-catergories-for-externally-added-specs